ia64: fix build.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c
index 538637b4521af505d9e49d75b8c2c2fa22d60b39..2d10be9345aef30998a5ac8d9b53ce23d7a96137 100644 (file)
--- a/xen/arch/x86/hvm/vmsi.c
+++ b/xen/arch/x86/hvm/vmsi.c
@@ -378,13 +378,12 @@ static void del_msixtbl_entry(struct msixtbl_entry *entry)
     call_rcu(&entry->rcu, free_msixtbl_entry);
 }
 
-int msixtbl_pt_register(struct domain *d, int pirq, uint64_t gtable)
+void msixtbl_pt_register(struct domain *d, int pirq, uint64_t gtable)
 {
     irq_desc_t *irq_desc;
     struct msi_desc *msi_desc;
     struct pci_dev *pdev;
     struct msixtbl_entry *entry;
-    int r = -EINVAL;
 
     /* pcidevs_lock already held */
     irq_desc = domain_spin_lock_irq_desc(d, pirq, NULL);
@@ -418,8 +417,6 @@ found:
 
 out:
     spin_unlock_irq(&irq_desc->lock);
-    return r;
-
 }
 
 void msixtbl_pt_unregister(struct domain *d, int pirq)
@@ -461,6 +458,7 @@ found:
     spin_unlock(&d->arch.hvm_domain.msixtbl_list_lock);
     spin_unlock(&irq_desc->lock);
 }
+
 void msixtbl_pt_cleanup(struct domain *d, int pirq)
 {
     struct msixtbl_entry *entry, *temp;

diff --git a/xen/drivers/passthrough/io.c b/xen/drivers/passthrough/io.c
index 40ed8ed12c2989ee45defd5398598c00fac13fab..9e5c230bb76436aa68289847289e0469e34a949a 100644 (file)
--- a/xen/drivers/passthrough/io.c
+++ b/xen/drivers/passthrough/io.c
@@ -58,8 +58,13 @@ static void pt_irq_time_out(void *data)
     pirq_guest_eoi(irq_map->dom, machine_gsi);
 }
 
-extern int msixtbl_pt_register(struct domain *d, int pirq, uint64_t gtable);
-extern int msixtbl_pt_unregister(struct domain *d, int pirq);
+#ifdef CONFIG_X86
+extern void msixtbl_pt_register(struct domain *d, int pirq, uint64_t gtable);
+extern void msixtbl_pt_unregister(struct domain *d, int pirq);
+#else
+#define msixtbl_pt_register(d, p, g) ((void)0)
+#define msixtbl_pt_unregister(d, p)  ((void)0)
+#endif
 
 int pt_irq_create_bind_vtd(
     struct domain *d, xen_domctl_bind_pt_irq_t *pt_irq_bind)